Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Sun, 1 Oct 2017 17:05:53 +0000 (13:05 -0400)
committerTom Rini <[email protected]>
Sun, 1 Oct 2017 17:05:53 +0000 (13:05 -0400)

Trivial merge